From e8c69a1186c72df781589144180009f711845619 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 10 May 2005 11:05:32 +0000 Subject: [PATCH] bitkeeper revision 1.1389.5.46 (4280957c13dvEVUuixaYEHltnt6E1A) Fix ACPI initialisation. Signed-off-by: Keir Fraser --- xen/arch/x86/setup.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f4967e9317..ac659a52de 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -77,12 +77,7 @@ unsigned long wait_init_idle; struct exec_domain *idle_task[NR_CPUS] = { &idle0_exec_domain }; -#ifdef CONFIG_ACPI_INTERPRETER -int acpi_disabled = 0; -#else -int acpi_disabled = 1; -#endif -EXPORT_SYMBOL(acpi_disabled); +int acpi_disabled; int phys_proc_id[NR_CPUS]; int logical_proc_id[NR_CPUS]; @@ -375,7 +370,10 @@ static void __init start_of_day(void) #endif paging_init(); /* not much here now, but sets up fixmap */ if ( !opt_noacpi ) + { + acpi_boot_table_init(); acpi_boot_init(); + } #ifdef CONFIG_SMP if ( smp_found_config ) get_smp_config(); -- 2.30.2